From 07f3a5f21618b2ceff0ee87faeaf82d0e5cab96e Mon Sep 17 00:00:00 2001
From: Vdauphin <vdauphin@outlook.fr>
Date: Tue, 3 Aug 2021 22:43:42 +0200
Subject: [PATCH] Fix merge conflicts

---
 addons/cargo/functions/fnc_unload.sqf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/addons/cargo/functions/fnc_unload.sqf b/addons/cargo/functions/fnc_unload.sqf
index efa279fb34..a2f0c1c875 100644
--- a/addons/cargo/functions/fnc_unload.sqf
+++ b/addons/cargo/functions/fnc_unload.sqf
@@ -52,6 +52,9 @@ if (_object isEqualType objNull) then {
 } else {
     _object = createVehicle [_item, _posAGL, [], 0, "NONE"];
     _object setPosASL (AGLtoASL _posAGL);
+
+    [QEGVAR(common,fixCollision), _object] call CBA_fnc_localEvent;
+    [QEGVAR(common,fixPosition), _object] call CBA_fnc_localEvent;
 };
 
 _object