add contact form
fix merge conflict