diff --git a/test1 b/test1
new file mode 100644
index 0000000..877a8d6
--- /dev/null
+++ b/test1
@@ -0,0 +1,11 @@
+<<<<<<< HEAD
+dev to master bracnh update
+
+
+
+=======
+dev to master bracnh updat  
+
+iam from master:wq!
+
+>>>>>>> master
diff --git a/testfile1 b/testfile1
new file mode 100644
index 0000000..b507730
--- /dev/null
+++ b/testfile1
@@ -0,0 +1 @@
+created ofr bracn test