Update contact.html

fixed conflict and photo issues.