diff --git a/roles/web-app-mailu/Todo.md b/roles/web-app-mailu/Todo.md
index 71c14607..46b923e3 100644
--- a/roles/web-app-mailu/Todo.md
+++ b/roles/web-app-mailu/Todo.md
@@ -1,4 +1,8 @@
 # Todos
 - Implement hard restart into Backup for mailu
+<<<<<<< HEAD
 - Check if DKIM generation works on new setups
 - Implement auto reverse DNS
+=======
+- Implement auto reverse DNS
+>>>>>>> 0b19d115 (Added todos)