git-annex automatic merge conflict fix