git-annex automatic sync
git-annex automatic merge conflict fix
merge refs/remotes/origin/synced/master