diff --git a/c b/c
new file mode 100644
index 0000000..3cf068a
--- /dev/null
+++ b/c
@@ -0,0 +1 @@
+fix conflicts