removed merge conflict from readme