Update readme

Remove conflicts