diff --git a/.dockerignore b/.dockerignore
index 1399ccd..796fa55 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -38,14 +38,9 @@ src/plugins/FancyNpcs/logs
 src/plugins/FancyNpcs/skins
 src/plugins/FancyNpcs/.data
 
-<<<<<<< HEAD
-
-src/plugins/DiscordSRV/accounts.aof
-
-
-=======
 src/plugins/ImageFrame/data
 src/plugins/ImageFrame/player
 src/plugins/ImageFrame/upload
 src/map-color-cache.dat
->>>>>>> develop
+
+src/plugins/DiscordSRV/accounts.aof