Updated enquiry questions template and removed conflict files