Update readme
Resolve conflicts