Fix git merge mangling