diff --git a/.github/workflows/bpi-r4-BE14-community.yaml b/.github/workflows/bpi-r4-BE14-community.yaml
index e40f56c..f109fec 100644
--- a/.github/workflows/bpi-r4-BE14-community.yaml
+++ b/.github/workflows/bpi-r4-BE14-community.yaml
@@ -120,7 +120,7 @@ jobs:
         with:
           files: bin/targets/mediatek/filogic/*
           tag_name: ${{ env.RELEASE_PREFIX }}-${{ env.REMOTE_BRANCH }}-${{ env.RELEASE_DATE }}
-          name: OpenWRT BPI-R4 + BE14 + luci BE - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
+          name: OpenWRT BPI-R4 ${{ env.DEVICE_CONFIG }} + BE14 + luci BE - ${{ env.REMOTE_BRANCH }} - ${{ env.RELEASE_DATE }}
           body: |
             Updated prebuilt images for ${{ env.RELEASE_DATE }} with BE14, luci BE, basic 5G modem packages, that was
             expected by the community members.
diff --git a/configs/mediatek/mt7988a/bpi-r4-poe b/configs/mediatek/mt7988a/bpi-r4-poe
index edb45ac..72aa6cc 100644
--- a/configs/mediatek/mt7988a/bpi-r4-poe
+++ b/configs/mediatek/mt7988a/bpi-r4-poe
@@ -5,8 +5,5 @@
 CONFIG_TARGET_mediatek=y
 CONFIG_TARGET_mediatek_filogic=y
 CONFIG_TARGET_mediatek_filogic_DEVICE_bananapi_bpi-r4-poe=y
-<<<<<<< HEAD
-=======
 
 CONFIG_PACKAGE_mt7988-2p5g-phy-firmware=y
->>>>>>> mikewilks-poe-option