Fixed conflicts in sudoku_controller
Auto merge fix