drops behaviors and supplies tables
fixes merge conflicts in schema