take out merge conflict text