Update readme file
Resolve conflict in configuration