removes merge conflict cruft in readme