From 9cff8112312bc4fa5604b2829853503c0843c365 Mon Sep 17 00:00:00 2001
From: Tom cappleman <thomas.cappleman@metaswitch.com>
Date: Wed, 10 Nov 2021 18:36:51 +0000
Subject: [PATCH] Fix merge issue

---
 orchagent/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/orchagent/Makefile.am b/orchagent/Makefile.am
index ed30d16434..f0d3fb8692 100644
--- a/orchagent/Makefile.am
+++ b/orchagent/Makefile.am
@@ -42,9 +42,9 @@ orchagent_SOURCES = \
             orch.cpp \
             notifications.cpp \
             nhgorch.cpp \
-            nhg/nhgbase.cpp \
-            nhg/nhghandler.cpp \
-            nhg/cbfnhghandler.cpp  \
+            cbf/nhgbase.cpp \
+            cbf/nhghandler.cpp \
+            cbf/cbfnhghandler.cpp  \
             nhgmaporch.cpp \
             routeorch.cpp \
             mplsrouteorch.cpp \