Remove merge conflict remnant from readme