Be aware that if you have a single machine syncthing won’t work.

Use any software that can do software merging, like meld, it does the job