Error During Conflict Resolving

https://www.openstreetmap.org/user/Alazar-AddisMap/diary/8421