diff --git a/Dockerfile-test-env b/Dockerfile-test-env
index a324dac5..614bc08c 100755
--- a/Dockerfile-test-env
+++ b/Dockerfile-test-env
@@ -4,7 +4,7 @@ RUN pip install --disable-pip-version-check --no-compile --no-cache-dir -q -r re
 
 FROM python:3.8-slim
 RUN apt-get update && apt-get install -y --no-install-recommends imagemagick
-RUN pip install black && echo  "find . -name \"*sync-conflict*\" -delete; black .; ./bot.py" > /usr/local/bin/start && chmod +x /usr/local/bin/start
+RUN pip install black && echo "black .; ./bot.py" >/usr/local/bin/start && chmod +x /usr/local/bin/start
 COPY --from=0 /usr/local/lib/python3.8/site-packages /usr/local/lib/python3.8/site-packages
 ADD app /app
 WORKDIR /app
diff --git a/app/bot.py b/app/bot.py
index 5c89d718..66961cea 100755
--- a/app/bot.py
+++ b/app/bot.py
@@ -78,6 +78,13 @@ async def did_you_mean(ctx):
             await ctx.reply("Did you mean /%s?" % command)
 
 
+@bot.listen("on_message")
+# harass jason with shitposts
+async def make_a_change(ctx):
+    if ctx.author.id == "83012791983673344":
+        await ctx.reply("Just tryin to make a change :-\\")
+
+
 @bot.listen("on_message")
 async def convert_heic_to_jpg(ctx):
     from cmagick import cmagick
diff --git a/format_code.sh b/format_code.sh
index 417a0cb9..87a39e44 100755
--- a/format_code.sh
+++ b/format_code.sh
@@ -1,2 +1 @@
- find . -name "*sync-conflict*" -delete
 docker run --rm -ti -v $(pwd):/tmp/python/app python:alpine sh -c "cd /tmp/python ; pip install -q black; black ."
diff --git a/test-dragon-bot.sh b/test-dragon-bot.sh
index ac5eb985..bb2e719e 100755
--- a/test-dragon-bot.sh
+++ b/test-dragon-bot.sh
@@ -1,5 +1,4 @@
 printf "\n[-] Formatting code\n"
-find . -name "*sync-conflict*" -delete
 ./format_code.sh
 printf "[+] Done\n"