diff --git a/pus_tc/devs/ploc_mpsoc.py b/pus_tc/devs/ploc_mpsoc.py
index accca67..f65ac89 100644
--- a/pus_tc/devs/ploc_mpsoc.py
+++ b/pus_tc/devs/ploc_mpsoc.py
@@ -25,9 +25,8 @@ flash_write_file_dict = {
 }
 
 mpsoc_file_dict = {
-    "1": ["0:/EM16/231", "0:/EM16/231"],
     MANUAL_INPUT: ["manual input", ""],
-    "2": ["/tmp/flash_write", "/tmp/flash_write.bin"],
+    "2": ["0:/EM16/231", "0:/EM16/231"],
 }
 
 
@@ -41,15 +40,12 @@ class CommandIds(enum.IntEnum):
     TC_REPLAY_WRITE_SEQUENCE = 13
     TC_DOWNLINK_PWR_ON = 14
     TC_DOWNLINK_PWR_OFF = 15
-<<<<<<< HEAD
     OBSW_RESET_SEQ_COUNT = 50
-=======
     TC_MODE_REPLAY = 16
 
 
 class MemAddresses(enum.IntEnum):
     DEADBEEF = 0x40000000
->>>>>>> 6572a5df6169772b517f2de2f3e4a1ba8f6471f4
 
 
 class PlocReplyIds: