fix merge conflicts
seed data and test new validations