Removes leftover merge conflict text -- oops.