fix the controller
Fixing merge conflicts.