Fixed Readme - Conflict Resolution