Fixed Readme for Conflicts