Logic to show score finished
Merge conflict