Fixed My_Controller Merge