git merge.ff was effing with stuff