Fixed duplicate issue with contact assignment list
updated search error message
resolved conflicts