clean up controllers
finish sessions
resolve branch merge