In the future when you are editing a communal folder like the rivers, please check if somebody posted an update to that folder after the last official update before you and base your edit on their edit in that case. This saves me the work of having to compare what is new and merging the folders.