Updated all the controllers
Merge conflict resolved