fix remainder of merge conflicts