Added final scoreboard
Fixed merge conflict