Fix merge conflicts in readme