changed the model class and controller
Merge origin/master