diff --git a/index.html b/index.html
index 6e08d6b5..bb84e7d9 100644
--- a/index.html
+++ b/index.html
@@ -627,7 +627,11 @@ Chrome on iOS, Internet Explorer and Safari does not implement <a href="https://
 <img src="img/addons/uBlock.gif" class="img-responsive pull-left" alt="uBlock" style="margin-right:30px;">
 <p><strong>uBlock Origin</strong> is an lightweight and efficient blocker: easy on memory and CPU footprint. The extension has no monetization strategy and development is volunteered. OS: Firefox, Safari, Opera, Chromium. AdBlock Plus is not recommended because they show "acceptable ads". The system behind that white list is lacking transparency.
 <br />
+<<<<<<< HEAD
 <a href="https://addons.mozilla.org/en/firefox/addon/ublock-origin/" target="_blank">https://addons.mozilla.org/en/firefox/addon/ublock-origin/</a>
+=======
+<a href="https://addons.mozilla.org/en/firefox/addon/ublock-origin/" target="_blank">https://addons.mozilla.org/de/firefox/addon/ublock-origin/</a>
+>>>>>>> origin/master
 </p>
 
 
@@ -1912,4 +1916,4 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
 <script> $(function () { $("[data-toggle='tooltip']").tooltip(); }); </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>