diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f83c618
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+logs/app.log
diff --git a/logs/app.log b/logs/app.log
index a021270..9e07b3d 100644
--- a/logs/app.log
+++ b/logs/app.log
@@ -764,6 +764,7 @@ Traceback (most recent call last):
     raise NotFound() from None
 werkzeug.exceptions.NotFound: 404 Not Found: The requested URL was not found on the server. If you entered the URL manually please check your spelling and try again.
  [in C:\Users\firem\Desktop\111\Systades\website\app.py:93]
+<<<<<<< HEAD
 2025-05-17 10:23:36,801 INFO: Anwendung gestartet [in C:\Users\firem\Desktop\111\Systades\website\app.py:77]
 2025-05-17 10:23:38,970 INFO: Anwendung gestartet [in C:\Users\firem\Desktop\111\Systades\website\app.py:77]
 2025-05-17 10:23:38,970 INFO: Anwendung gestartet [in C:\Users\firem\Desktop\111\Systades\website\app.py:77]
@@ -1202,3 +1203,11 @@ Traceback (most recent call last):
     raise NotFound() from None
 werkzeug.exceptions.NotFound: 404 Not Found: The requested URL was not found on the server. If you entered the URL manually please check your spelling and try again.
  [in C:\Users\firem\Desktop\111\Systades\website\app.py:93]
+=======
+2025-05-17 18:25:44,474 INFO: Anwendung gestartet [in C:\Users\TTOMCZA.EMEA\Dev\website\app.py:77]
+2025-05-17 18:25:46,741 INFO: Anwendung gestartet [in C:\Users\TTOMCZA.EMEA\Dev\website\app.py:77]
+2025-05-17 18:25:46,741 INFO: Anwendung gestartet [in C:\Users\TTOMCZA.EMEA\Dev\website\app.py:77]
+2025-05-17 18:25:50,143 INFO: Anwendung gestartet [in C:\Users\TTOMCZA.EMEA\Dev\website\app.py:77]
+2025-05-17 18:25:52,266 INFO: Anwendung gestartet [in C:\Users\TTOMCZA.EMEA\Dev\website\app.py:77]
+2025-05-17 18:25:52,266 INFO: Anwendung gestartet [in C:\Users\TTOMCZA.EMEA\Dev\website\app.py:77]
+>>>>>>> cab8d28aeb809d900fa18048b286cb729bd2e8c9