Hello!
Another mapper (UrbanUnPlanner) had an open changeset when this went in and asked me to do the conflict resolution (https://www.openstreetmap.org/changeset/136947123) I think your changes are all still intact but wanted to let you know in case I've botched something. Would you mind taking a look?