added honeypot to the contact form
fixed merge conflicts