Beautification

Remove the conflict markers from the readme.