diff --git a/modules b/modules
index 1566391..d215c12 100644
--- a/modules
+++ b/modules
@@ -2,8 +2,4 @@ GLUON_SITE_FEEDS='ffhb'
 
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git
 PACKAGES_FFHB_BRANCH=breminale2016
-<<<<<<< HEAD
 PACKAGES_FFHB_COMMIT=b415c1d264810522aad3b78b41fc1041f0fb15b5
-=======
-PACKAGES_FFHB_COMMIT=6a9ca2a293dbd75eed3c661d2db9e04e6c68d3f3
->>>>>>> 5c9690c4b7bbe75ba0b6331d3ddeb3ce053be002
diff --git a/site.mk b/site.mk
index 10f18e4..1cee5d8 100644
--- a/site.mk
+++ b/site.mk
@@ -3,7 +3,7 @@ GLUON_SITE_PACKAGES := \
 	gluon-client-bridge \
 	gluon-respondd \
 	gluon-respondd-airtime \
-	gluon-respondd-lldp \
+	gluon-respondd-clients \
 	gluon-respondd-wifisettings \
 	gluon-ebtables-filter-ra-dhcp \
 	gluon-ebtables-filter-multicast \