[Bug 1010593] Add back option to merge groups in the admin

The field "Merge groups" disappeared after the fieldsets attribute on the model admin was set, this change simply add the "merge_with" field to the fieldset so it display again.