Automatically resolve Syncthing conflicts using a three-way merge | Hacker News Reader