Fix conflicts and formatting of contact handle