diff --git a/persistence/players/c_playerDBSetup.sqf b/persistence/players/c_playerDBSetup.sqf
index 8137d82c1..1a9c3ba47 100644
--- a/persistence/players/c_playerDBSetup.sqf
+++ b/persistence/players/c_playerDBSetup.sqf
@@ -57,14 +57,6 @@ applyPlayerDBValues =
 			{
 				player addMagazine [_className, _ammoCount];
 			};
-<<<<<<< Updated upstream
-			if(_fits == 3) then
-			{
-				_backpack = unitBackpack player;
-				_backpack addMagazineCargo [_className,1];
-			};
-=======
->>>>>>> Stashed changes
 		} forEach _varValue;
 	};