added validations
removing conflicts