added a fieldset
merge