change base controller
fix conflict