fixed merge conflict
Merge pull request #3 from jojo89/testing_models

fixed merge conflict