Conflict while uploading? You use Go Map! ? If so, then you can download .osc to upload the server during the changes to the server, and open it in JOSM to eliminate the conflict.

Or when sending, manually update the version of this way by editing XML file

You can also contact me and other cartographers in Telegram chat https://t.me/openstreetmaporg