Migrate Merge Contact feature to new location format

Since now we don't have location concept, we need to make following changes to existing Merge Contact Interface

• Allow merging of individual block rather than entire location merging
• Add a checkbox for forcefully adding new block rather than overwriting.
• migrate to new location api's