diff --git a/cl_dll/ev_hldm.cpp b/cl_dll/ev_hldm.cpp
index 1bec1df2..1fcc47dd 100644
--- a/cl_dll/ev_hldm.cpp
+++ b/cl_dll/ev_hldm.cpp
@@ -1423,7 +1423,7 @@ BEAM *pBeam2;
 /*
 void EV_EgonFire( event_args_t *args )
 {
-	int idx, /*iFireState,*/ iFireMode;
+	int idx, iFireState, iFireMode;
 	vec3_t origin;
 
 	idx = args->entindex;
diff --git a/dlls/python.cpp b/dlls/python.cpp
index 0aeaa906..2ae34f96 100644
--- a/dlls/python.cpp
+++ b/dlls/python.cpp
@@ -227,14 +227,9 @@ void CPython::Reload( void )
 #else
 	bUseScope = g_pGameRules->IsMultiplayer();
 #endif
-<<<<<<< HEAD
-	int iResult = DefaultReload( PYTHON_MAX_CLIP, PYTHON_RELOAD, 2.0, bUseScope );
-	if( iResult )
-=======
 	if( DefaultReload( PYTHON_MAX_CLIP, PYTHON_RELOAD, 2.0, bUseScope ) )
->>>>>>> travis
 	{
-		m_flSoundDelay = gpGlobals->time + 1.5;
+		m_flSoundDelay = 1.5;
 	}
 }
 
diff --git a/dlls/visitors/kevlar.cpp b/dlls/visitors/kevlar.cpp
index cabbcb8c..886dc930 100644
--- a/dlls/visitors/kevlar.cpp
+++ b/dlls/visitors/kevlar.cpp
@@ -48,7 +48,7 @@ class CItemKevlar : public CItem
 			(pPlayer->pev->weapons & (1 << WEAPON_SUIT)))
 		{
 			pPlayer->pev->armorvalue += MAX_NORMAL_BATTERY;
-			pPlayer->pev->armorvalue = min(pPlayer->pev->armorvalue, MAX_NORMAL_BATTERY);
+			pPlayer->pev->armorvalue = Q_min(pPlayer->pev->armorvalue, MAX_NORMAL_BATTERY);
 
 			EMIT_SOUND(pPlayer->edict(), CHAN_ITEM, "player/kevlar_zipper.wav", 1, ATTN_NORM);