diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml
index 284861a..9cd4415 100644
--- a/.github/workflows/lo-test.yml
+++ b/.github/workflows/lo-test.yml
@@ -49,7 +49,7 @@ jobs:
           if [ -d 'lede/.git' ]; then
           cd lede && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
           git remote set-branches --add origin openwrt-18.06
-          git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge --commit --no-edit origin/openwrt-18.06
+          git fetch && git reset --hard origin/openwrt-18.06-k5.4 && git merge -X theirs --no-edit origin/openwrt-18.06
           else
           sudo chown $USER:$(id -gn) lede && (cd lede && git init && git remote add -t openwrt-18.06-k5.4 -f origin https://github.com/immortalwrt/immortalwrt && git checkout openwrt-18.06-k5.4)
           fi
diff --git a/merge_packages.sh b/merge_packages.sh
index d6ba9cb..a7d6cda 100644
--- a/merge_packages.sh
+++ b/merge_packages.sh
@@ -21,11 +21,12 @@ merge_package https://github.com/coolsnowwolf/packages/trunk/kernel/ksmbd
 merge_package https://github.com/coolsnowwolf/packages/trunk/net/ksmbd-tools
 
 if [ $DEVICE = 'r2s' ]; then
-mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
-wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/usr/bin/start-rk3328-pwm-fan.sh -qNP files/usr/bin
-chmod +x files/usr/bin/start-rk3328-pwm-fan.sh
-wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/etc/init.d/fa-rk3328-pwmfan -qNP files/etc/init.d
-chmod +x files/etc/init.d/fa-rk3328-pwmfan
-ln -sf ../init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
-sed -i "s/enable '0'/enable '1'/" package/ctcgfw/luci-app-oled/root/etc/config/oled
+    mkdir -p files/usr/bin files/etc/init.d files/etc/rc.d
+    wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/usr/bin/start-rk3328-pwm-fan.sh -qNP files/usr/bin
+    chmod +x files/usr/bin/start-rk3328-pwm-fan.sh
+    wget https://github.com/friendlyarm/friendlywrt/raw/master-v19.07.1/target/linux/rockchip-rk3328/base-files/etc/init.d/fa-rk3328-pwmfan -qNP files/etc/init.d
+    chmod +x files/etc/init.d/fa-rk3328-pwmfan
+    ln -sf ../init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
+    merge_package https://github.com/NateLol/luci-app-oled
+    sed -i "s/enable '0'/enable '1'/" package/luci-app-oled/root/etc/config/oled
 fi
diff --git a/patches.sh b/patches.sh
index 72ca4db..bd5fa63 100644
--- a/patches.sh
+++ b/patches.sh
@@ -7,7 +7,7 @@ echo -e "\toption maxfreq0 '1512000'\n" >> package/lean/luci-app-cpufreq/root/et
 sed -i "s/option hw_flow '1'/option hw_flow '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc
 sed -i "s/option sfe_flow '1'/option sfe_flow '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc
 sed -i "s/option sfe_bridge '1'/option sfe_bridge '0'/" package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc
-sed -i "/INCLUDE_shortcut-fe=n/d" package/ctcgfw/luci-app-turboacc/Makefile
+sed -i "/dep.*INCLUDE_.*=n/d" package/ctcgfw/luci-app-turboacc/Makefile
 
 sed -i '/Installed-Time/a\sed -i "s/\\([[:digit:]]\)-[a-z0-9]\{32\}/\1/" $(1)/usr/lib/opkg/status\' include/rootfs.mk
 find . -type f -name nft-qos.config | xargs sed -i "s/option limit_enable '1'/option limit_enable '0'/"