Trying to fix merge
Fixing the merge error by force
remove session disconnect to end game on controller