linebreak in readme
Fixed conflicts