diff --git a/.prettierignore b/.prettierignore
index d8eeeba..f1a0e24 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,16 +1,8 @@
 *~
 flake.*
-<<<<<<< HEAD
-*.cs
-=======
->>>>>>> 16880cb36e748cd195e5ad85c4100e4209cc594c
 
 node_modules/
 .direnv/
 .config/
 obj/
-<<<<<<< HEAD
 bin/
-=======
-bin/
->>>>>>> 16880cb36e748cd195e5ad85c4100e4209cc594c