From 9c1a76707f17be57c7558c1e6eacd2d267a84475 Mon Sep 17 00:00:00 2001
From: Regalis <regalis@undertowgames.com>
Date: Wed, 17 May 2017 18:56:45 +0300
Subject: [PATCH] conflict fix

---
 Subsurface/Source/Networking/GameClient.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Subsurface/Source/Networking/GameClient.cs b/Subsurface/Source/Networking/GameClient.cs
index e04a4c2cc..e2df17800 100644
--- a/Subsurface/Source/Networking/GameClient.cs
+++ b/Subsurface/Source/Networking/GameClient.cs
@@ -538,7 +538,7 @@ namespace Barotrauma.Networking
                                 
                                 break;
                             case ServerPacketHeader.STARTGAME:
-                                startGameCoroutine = GameMain.ShowLoading(StartGame(inc), false);
+                                startGameCoroutine = GameMain.Instance.ShowLoading(StartGame(inc), false);
                                 break;
                             case ServerPacketHeader.ENDGAME:
                                 string endMessage = inc.ReadString();