diff --git a/app/app.py b/app/app.py
index 3273dd0..9788e36 100644
--- a/app/app.py
+++ b/app/app.py
@@ -166,14 +166,9 @@ def add_template_filters(app: Flask) -> None:
         return str(datetime.now().year)
 
     @app.template_filter("euro")
-<<<<<<< HEAD
     def euro(value: int) -> str:
-        return euro_string(value)
-=======
-    def euro(value: int) -> None:
         "A function which converts a value to its euro_string"
-        euro_string(value)
->>>>>>> Fix pylint for Haldis
+        return euro_string(value)
 
 
 # For usage when you directly call the script with python