Cleanup some merge conflicts

SQF/dayz_code/compile/fn_updateCraftUI.sqf

@@ -3,6 +3,8 @@
 	Please request permission to use/alter from ziellos2k.
 
 	Edited by Alby with permission from ziellos2k.
+	
+	Included in Epoch with permission by @ebaydayz
 */
 disableSerialization;
 

SQF/dayz_code/compile/player_death.sqf

@@ -50,11 +50,8 @@ player setVariable ["bloodTaken", false, true];
 player setVariable ["startcombattimer", 0];
 r_player_unconscious = false;
 r_player_cardiac = false;
-<<<<<<< HEAD
 _model = typeOf player;
-=======
 autoRunActive = 0;
->>>>>>> upstream/master
 
 _array = _this;
 if (count _array > 0) then {