diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 2acfdbda60..7da343f31d 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -109,12 +109,7 @@
 
 /obj/item/reagent_containers/glass/bottle/facid
 	name = "Fluorosulfuric Acid Bottle"
-<<<<<<< HEAD
-	desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid"
-	icon_state = "bottle17"
-=======
 	desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
->>>>>>> 0616b84... bottle sprite stuff
 	list_reagents = list("facid" = 30)
 
 /obj/item/reagent_containers/glass/bottle/adminordrazine