editing controllers
edit controllers
edit controllers
fix merge conflicts