Remove conflict marker from readme