Remove merge junk left over in README