add MainController controller
fix merge conflict