cleaned up errors caused by merge conflicts and use of 'git mergetool ...' with kdiff3