Working on the end on the game notification
Fix conflicts