Readme - Properly correcting conflicts