diff --git a/Sharishma.md b/Sharishma.md
new file mode 100644
index 00000000..b1be35a0
--- /dev/null
+++ b/Sharishma.md
@@ -0,0 +1,2 @@
+Git hub training 09/28
+adding conflict