diff --git a/Github meaning b/Github meaning
new file mode 100644
index 0000000..69c2af5
--- /dev/null
+++ b/Github meaning	
@@ -0,0 +1 @@
+Github is online web platfrom for version control and colabration . in git hub we willstore branches data ,merge data ,add data changes and errors and logs data 
diff --git a/merge conflict testing b/merge conflict testing
index 15a266d..c913059 100644
--- a/merge conflict testing	
+++ b/merge conflict testing	
@@ -1,5 +1,4 @@
 Hi This is my file 
 i amd doing firrst enstry
-
-
+i added one more line in the devops git repo
 i am going to add the line in the main file