validations added to models
Fix merge conflicts