some validations
merge conflicts