Nice one, I have the same problem with #syncthing conflicted files, should try using git merge for them

https://www.rafa.ee/articles/resolve-syncthing-conflicts-using-three-way-merge/