Update README

Remove the conflict markers