added contact form
resolved conflict