Hello! Another user (ferog_v) is doing boundary updates and hit conflicts with their edit. I have tried to sort it out but it's possible that I may have mismerged something you were updating here and I would love if you could take a quick look.

Here's the changeset in question: https://www.openstreetmap.org/changeset/151649332