form validation done while registration
merge conflicts resolved