add review validations
modify conflicts