Did not remove conflict markers for similar text on the home page