Updated README to remove numbered list
Fixed merge conflicts