diff --git a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
index f7c1d297d8a..fa266144d43 100644
--- a/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
+++ b/Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
@@ -1,14 +1,8 @@
 - type: vessel
   id: Empress
-<<<<<<< HEAD:Resources/Prototypes/_NF/Shipyard/Security/empress.yml
   name: NSF Императрица
   description: Крупногабаритный патрульшый шаттл ДСБФ. Рекомендованный состав команды 4-8 человек.
-  price: 170000 #Appraisal value is 173000
-=======
-  name: NSF Empress
-  description: A large patrol vessel capable of carrying up to 3 smaller faster attack ships. the flagship vessel of the nfsd.
   price: 170000 #Appraisal value is 150000
->>>>>>> upstream/master:Resources/Prototypes/_NF/Shipyard/Nfsd/empress.yml
   category: Large
   group: Security
   shuttlePath: /Maps/_NF/Shuttles/Nfsd/empress.yml