Merge conflicts need to be removed from the code.