new readme
Merge Conflict Fix