merging origin/git-annex into git-annex (recovery from race #1; expected commit parent Ref "ff8aa1778ad3c1e12b477312e3123393eab1bf5e" but found [Ref "bcbdcc55a5abd03e50fc718afab18e2d331fc219",Ref "4a789ee90591a553cb11e53a9e8dc04ae9c17d92"] )