adds validation gems
fixes merge conflicts