Refactor ScoreBoard
resolve conflicts