Osm:Conflict overwrite/aln

Mbishkruaj versionin e tyre