A tool with similar functionalities to JOSM for OpenStreetMap data conflation (merging) - View it on GitHub