Fixed goofy readme caused by merge conflicts.