removed merge conflict text from readme