Fix enquiry form
Fix merge