diff --git a/Docker/semaphore-ui/.env.example b/Docker/semaphore-ui/.env.example
index b359d01..dad2100 100644
--- a/Docker/semaphore-ui/.env.example
+++ b/Docker/semaphore-ui/.env.example
@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 SEMAPHORE_ADMIN=admin
 SEMAPHORE_ADMIN_PASSWORD=changeme
 SEMAPHORE_ADMIN_NAME=Admin
-SEMAPHORE_ADMIN_EMAIL=admin@example.com
\ No newline at end of file
+SEMAPHORE_ADMIN_EMAIL=admin@example.com
+=======
+ADMIN_USER=admin
+ADMIN_PASS=changeme
+ADMIN_NAME=Admin
+ADMIN_EMAIL=admin@example.com
+>>>>>>> ab90593 (ADD: Semaphore UI initial commit)