finish sessions controller
fix conficts