added a controller and delt with more merge errors