Manual fix of changes, git mergetool doesn't want to work