diff --git a/feeds.conf.default b/feeds.conf.default
index ef76ed8869..ad26f7aeef 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,12 +1,5 @@
-<<<<<<< HEAD
 src-git packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
 src-git luci https://git.openwrt.org/project/luci.git;openwrt-23.05
 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
 src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05
-=======
-src-git-full packages https://git.openwrt.org/feed/packages.git;openwrt-23.05
-src-git-full luci https://git.openwrt.org/project/luci.git;openwrt-23.05
-src-git-full routing https://git.openwrt.org/feed/routing.git;openwrt-23.05
-src-git-full telephony https://git.openwrt.org/feed/telephony.git;openwrt-23.05
-src-git nss https://github.com/qosmio/nss-packages.git;NSS-11.2-K5.15
->>>>>>> 19845846d5 (Add NSS Package Feed)
+src-git nss https://github.com/ACwifidude/nss-packages.git;NSS-11.2-K5.15