fixing controllers
fix conflicts