Merge contacts: changed checkbox into button, added tooltips
Merge contacts: resolved conflicted on merge