diff --git a/package/boot/uboot-envtools/files/mediatek_filogic b/package/boot/uboot-envtools/files/mediatek_filogic
index 9af343ae3c..d9b899ecea 100644
--- a/package/boot/uboot-envtools/files/mediatek_filogic
+++ b/package/boot/uboot-envtools/files/mediatek_filogic
@@ -41,6 +41,7 @@ bananapi,bpi-r3-mini)
 cetron,ct3003-stock|\
 cetron,ct3003-ubootmod|\
 cmcc,rax3000m-nand-ubootmod|\
+h3c,magic-nx30-pro-nmbm|\
 netgear,wax220|\
 zbtlink,zbt-z8102ax|\
 zbtlink,zbt-z8103ax)
@@ -74,9 +75,7 @@ glinet,gl-mt6000)
 glinet,gl-mt3000)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x80000" "0x20000"
 	;;
-<<<<<<< HEAD
 h3c,magic-nx30-pro|\
-h3c,magic-nx30-pro-nmbm|\
 jcg,q30|\
 qihoo,360t7|\
 tplink,tl-xdr4288|\