README modified
Resolve conflict