diff --git a/protos/ibpGraphics.proto b/protos/ibpGraphics.proto
index c6606f2..7beb207 100644
--- a/protos/ibpGraphics.proto
+++ b/protos/ibpGraphics.proto
@@ -1,6 +1,5 @@
 syntax = "proto3";
 import "stationLayoutGraphics.proto";
-import "relayCabinetLayoutGraphics.proto";
 package ibpGraphicData;
 option go_package = "./ats/verify/protos/graphicData";
 
@@ -11,12 +10,8 @@ message IBPGraphicStorage {
   repeated IbpKey ibpKeys = 4;
   repeated IbpArrow ibpArrows = 5;
   repeated IBPText IBPTexts = 6;
-<<<<<<< HEAD
   // UniqueIdType UniqueIdPrefix = 7;
   repeated IbpRelatedDevice ibpRelatedDevices = 8;
-=======
-  relayCabinetGraphicData.UniqueIdType UniqueIdPrefix = 7;
->>>>>>> b33cc6eee0d88f566a6370e12633da50883b4d34
 }
 
 message IBPButton {