Merge contacts

Merges two contacts into one, combining their channel identities and conversation history.