fix git merge horrific mess