diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm
index cc50bf2fff..a26e2149a2 100644
--- a/code/datums/traits/negative.dm
+++ b/code/datums/traits/negative.dm
@@ -324,7 +324,6 @@
 	gain_text = "<span class='danger'>There's a lot on your mind right now.</span>"
 	lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
 	medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
-<<<<<<< HEAD
 
 //For reviewers: If you think it's a bad idea, feel free to remove it. Removal requested, commented out until the end of review (will remove when fixing merge conflicts).
 /*
@@ -352,5 +351,3 @@
    H.apply_status_effect(/datum/status_effect/trance, 200, TRUE)
    qdel(src)
  */
-=======
->>>>>>> f3a3e4c47ae527bd576fcee254836e1c1d8bdfcb
diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
index 77c0d4985f..5580057d8f 100644
--- a/code/modules/mob/living/blood.dm
+++ b/code/modules/mob/living/blood.dm
@@ -55,7 +55,6 @@
 
 		//Effects of bloodloss
 		var/word = pick("dizzy","woozy","faint")
-		//switch(blood_volume) Used to be a switch statement; now it uses ifs (so blood ratio can work.) Check my logic please.
 		switch(blood_volume * INVERSE(blood_ratio))
 			if(BLOOD_VOLUME_OKAY to BLOOD_VOLUME_SAFE)
 				if(prob(5))