cleanup various merge conflict resolution errors/omissions