Fix additional merge conflicts in README