Adding option for assigning classes to fields
Merge resolution
Further merge resolution