Improve readme
Solve conflicts