Added form validation
Resolve conflicts