Fixed fixtures errors
Finished update Model
Finished update model and updates controller(only show action)
Fixed merge error