read me changes
Fixed conflict