added form validation
merge