diff --git a/college.txt b/college.txt
new file mode 100644
index 0000000..80ec7f9
--- /dev/null
+++ b/college.txt
@@ -0,0 +1 @@
+vvce college of engineering mysuru karnataka
\ No newline at end of file
diff --git a/conflict.txt b/conflict.txt
new file mode 100644
index 0000000..841f6af
--- /dev/null
+++ b/conflict.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+branch1
+=======
+branch2
+>>>>>>> branch2
diff --git a/demo.txt b/demo.txt
new file mode 100644
index 0000000..8e27be7
--- /dev/null
+++ b/demo.txt
@@ -0,0 +1 @@
+text