adding working sessions controller
fixing conflicts