Removes some errant merge conflict marks (oy vey)