corrections from issues with vimdiff. first time handling a merge and some errors were made