Handle multiple assignments and unassignment in All Contacts page
Fix merging conflicts