Take out merge conflicts in the comments that were missed