changes made
custom fields legend field
conflict removed