Realignment of the game has been done
Merged conflicts
Merge Conflicts