changes made in user form, roles form, setting tab, item index page and contact
conflict removed