diff --git a/feeds.conf.default b/feeds.conf.default
index dd3210a1c7..98afba6b3e 100644
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,6 +1,5 @@
-<<<<<<< HEAD
 src-git packages https://git.openwrt.org/feed/packages.git^b5ed85f6e94aa08de1433272dc007550f4a28201
-src-git luci https://github.com/asvio/luci.git;luci-23.05-vht
+src-git luci https://github.com/ricsc/luci.git;openwrt-23.05
 src-git routing https://git.openwrt.org/feed/routing.git^e351d1e623e9ef2ab78f28cb1ce8d271d28c902d
 src-git telephony https://git.openwrt.org/feed/telephony.git^98c8a5aa4624312ed758e2e2b6d4039050a1649d
 src-git nss https://github.com/ricsc/nss-packages.git;NSS-11.2-K5.15