fix more merge conflicts in contact.html