Fixed some stuff...
Fixed merge conflict in NetworkGameScene.unity