add bets controller
resolve conflicts