removed merge conflict text, updated readme