I saw something regarding conflict management on the JOSM mailinglist yesterday. I think the newest versions are going to handle conflicts better…