Readme: update readme instructions
Merge conflict fix