diff --git a/filter.txt b/filter.txt
index fa944b9..0f01fc9 100644
--- a/filter.txt
+++ b/filter.txt
@@ -1,10 +1,6 @@
 [Adblock Plus]
 ! Title: FutaFilter
-<<<<<<< HEAD
 ! Version: 2021.0319.01
-=======
-! Version: 2021.0310.01
->>>>>>> 839a9a9492c9a04cc386786d880af91fb0acc079
 ! Expires: 1 hour
 ! Homepage: https://t.me/adguard_tw
 ! ----------------------------------------------------------------------
@@ -132,4 +128,4 @@ coffeehunter.tw##div[class^="fancybox-wrap"]
 ||bilanx.dcard.tw/*/events
 
 ! PTT 相關
-||pttbrain.herokuapp.com/api/ptt/metric/user-geo-distributions^$document
\ No newline at end of file
+||pttbrain.herokuapp.com/api/ptt/metric/user-geo-distributions^$document