Add Good, Need and Merchandise models with STI
resolve merge conflicts