removed remainder of merge conflict