diff --git a/sslproxies_1d.ipset b/sslproxies_1d.ipset
index 10e300a5d85d..271255577a82 100644
--- a/sslproxies_1d.ipset
+++ b/sslproxies_1d.ipset
@@ -9,21 +9,18 @@
 # Maintainer      : Free Proxy List
 # Maintainer URL  : http://free-proxy-list.net/
 # List source URL : http://www.sslproxies.org/
-<<<<<<< Updated upstream
 # Source File Date: Sat Jan 25 07:32:02 UTC 2025
 #
 # Category        : anonymizers
 # Version         : 201759
 #
 # This File Date  : Sat Jan 25 07:32:08 UTC 2025
-=======
 # Source File Date: Sat Jan 25 07:42:02 UTC 2025
 #
 # Category        : anonymizers
 # Version         : 201760
 #
 # This File Date  : Sat Jan 25 07:44:11 UTC 2025
->>>>>>> Stashed changes
 # Update Frequency: 10 mins 
 # Aggregation     : 1 day 
 # Entries         : 290 unique IPs