merge manage controller into main controller