Final commit controller
Merge conflicts