Readme updated
Merge conflic resolved