Update README, remove conflicts