Fixed merge conflict (PP10 & PP11 Controller