Updated formatting in project README
Fixed merge conflict on README