removed merge conflict text