Hi Alex
I see we are having a mapping conflict in this area. Let's continue the conversation in https://community.openstreetmap.org/t/notification-to-prevent-an-edit-war-in-qatar-with-mapbox/124481 and define a solution.