Resolving merge conflict

Signed-off-by: Vladimir Kuk <[email protected]>

Author: VladimirKuk

common/schema.h

@@ -54,6 +54,7 @@ namespace swss {
 #define APP_SWITCH_TABLE_NAME             "SWITCH_TABLE"
 #define APP_NEXTHOP_GROUP_TABLE_NAME      "NEXTHOP_GROUP_TABLE"
 #define APP_CLASS_BASED_NEXT_HOP_GROUP_TABLE_NAME "CLASS_BASED_NEXT_HOP_GROUP_TABLE"
+#define APP_EVPN_SPLIT_HORIZON_TABLE_NAME    "EVPN_SPLIT_HORIZON_TABLE"
 
 #define APP_P4RT_TABLE_NAME                   "P4RT_TABLE"
 #define APP_P4RT_TABLES_DEFINITION_TABLE_NAME "TABLES_DEFINITION_TABLE"
@@ -393,11 +394,6 @@ after libswsscommon deb make.
 #define CFG_WARM_RESTART_TABLE_NAME                 "WARM_RESTART"
 #define CFG_HIGH_FREQUENCY_TELEMETRY_PROFILE_TABLE_NAME "HIGH_FREQUENCY_TELEMETRY_PROFILE"
 #define CFG_HIGH_FREQUENCY_TELEMETRY_GROUP_TABLE_NAME "HIGH_FREQUENCY_TELEMETRY_GROUP"
-#define CFG_ARS_PROFILE                             "ARS_PROFILE"
-#define CFG_ARS_INTERFACE                           "ARS_INTERFACE"
-#define CFG_ARS_OBJECT                              "ARS_OBJECT"
-#define CFG_ARS_NEXTHOP                             "ARS_NEXTHOP"
-
 
 #define CHASSIS_APP_SYSTEM_INTERFACE_TABLE_NAME     "SYSTEM_INTERFACE"
 #define CHASSIS_APP_SYSTEM_NEIGH_TABLE_NAME         "SYSTEM_NEIGH"
@@ -518,6 +514,10 @@ after libswsscommon deb make.
 #define STATE_QUEUE_COUNTER_CAPABILITIES_NAME   "QUEUE_COUNTER_CAPABILITIES"
 #define STATE_PORT_COUNTER_CAPABILITIES_NAME    "PORT_COUNTER_CAPABILITIES"
 
+/* ARS */
+#define STATE_ARS_PROFILE_TABLE_NAME            "ARS_PROFILE_TABLE"
+#define STATE_ARS_CAPABILITY_TABLE_NAME         "ARS_CAPABILITY_TABLE"
+
 /***** PROFILE DATABASE *****/
 
 #define PROFILE_DELETE_TABLE                  "PROFILE_DELETE"
@@ -548,11 +548,6 @@ after libswsscommon deb make.
 #define BMP_STATE_BGP_RIB_IN_TABLE               "BGP_RIB_IN_TABLE"
 #define BMP_STATE_BGP_RIB_OUT_TABLE              "BGP_RIB_OUT_TABLE"
 
-/* ARS */
-#define STATE_ARS_PROFILE_TABLE_NAME            "ARS_PROFILE_TABLE"
-#define STATE_ARS_CAPABILITY_TABLE_NAME         "ARS_CAPABILITY_TABLE"
-
-
 #ifdef __cplusplus
 }
 #endif