Contacts cleanup & merge

by Afshin Gholami