Updated README with information about fieldset

- also gets rid of some merge conflict artifacts