Bulk contact update in All Contacts page
Fix conflicts