fix merge markers

Author: dzarista

fboss/platform/configs/meru800bfa/platform_manager.json

@@ -4132,13 +4132,6 @@
     "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH7": "/[SCM_I2C_MASTER1@7]",
     "/run/devmap/eeproms/MERU800BFA_SMB_EEPROM": "/SMB_SLOT@0/[IDPROM]",
     "/run/devmap/sensors/CPU_MPS_PMBUS": "/[SCM_MPS_PMBUS]",
-<<<<<<< HEAD
-    "/run/devmap/sensors/CPU_PXM1310_1": "/[SCM_PXM1310_1]",
-    "/run/devmap/sensors/CPU_PXE1211": "/[SCM_PXE1211]",
-    "/run/devmap/sensors/CPU_PXM1310_2": "/[SCM_PXM1310_2]",
-=======
-    "/run/devmap/eeproms/MERU_SCM_EEPROM_P1": "/[SCM_IDPROM_P1]",
->>>>>>> db48c08528 (standardize meru configs)
     "/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]",
     "/run/devmap/sensors/NVME_TEMP": "/[NVME_TEMP]",
     "/run/devmap/fpgas/MERU800BFA_SMB_FPGA0": "/SMB_SLOT@0/[SMB_FPGA0]",

fboss/platform/configs/meru800bia/platform_manager.json

@@ -1491,13 +1491,6 @@
     "/run/devmap/i2c-busses/MERU_SCM_CPLD_SMBUS1_CH7": "/[SCM_I2C_MASTER1@7]",
     "/run/devmap/eeproms/MERU800BIA_SMB_EEPROM": "/SMB_SLOT@0/[IDPROM]",
     "/run/devmap/sensors/CPU_MPS_PMBUS": "/[SCM_MPS_PMBUS]",
-<<<<<<< HEAD
-    "/run/devmap/sensors/CPU_PXM1310_1": "/[SCM_PXM1310_1]",
-    "/run/devmap/sensors/CPU_PXE1211": "/[SCM_PXE1211]",
-    "/run/devmap/sensors/CPU_PXM1310_2": "/[SCM_PXM1310_2]",
-=======
-    "/run/devmap/eeproms/MERU_SCM_EEPROM_P1": "/[SCM_IDPROM_P1]",
->>>>>>> db48c08528 (standardize meru configs)
     "/run/devmap/sensors/CPU_CORE_TEMP": "/[CPU_CORE_TEMP]",
     "/run/devmap/sensors/NVME_TEMP": "/[NVME_TEMP]",
     "/run/devmap/fpgas/MERU800BIA_SMB_FPGA": "/SMB_SLOT@0/[SMB_FPGA]",