diff --git a/README.md b/README.md
index e389399..d2b43b3 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-# OPS_final_Practical
\ No newline at end of file
+# OPS_final_Practical
+merging conflicts in repository