git-annex automatic sync
git-annex automatic merge conflict fix