JOSM supports merging changes and conflict resolving from changed areas (remember to do a download prior every upload).

• JOSM支持整合和解决改变区域的冲突（记得每次上载之前要先下载）。