- removed merge conflict text