Would you like to copy the permanent link to your clipboard?
Permanent link:
https://help.openstreetmap.org/questions/28109/merge-generated-josm-with-osm-data-conflicts/28113