fixed a bug for controller.py
fixed conflicts in controllers.py