diff --git a/arti b/arti
new file mode 100644
index 0000000..f4d0d34
--- /dev/null
+++ b/arti
@@ -0,0 +1 @@
+hi merge and confilits