Fix bad merge resolution

Author: wroyca

src/Game/Structs.hpp

@@ -7682,10 +7682,11 @@ namespace Game
 		int useCount;
 		gentity_s* nextFree;
 		int birthTime;
+		char pad210[4];
+		gentity_s** linkedEntity; // used in G_RunMissile, name was guessed
+		char pad218[92];
 	};
 
-	static_assert(sizeof(gentity_s) == 0x274);
-
 	enum
 	{
 		ENTFIELD_ENTITY = 0x0,