diff --git a/README.md b/README.md
index e389399..85a3cbf 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,2 @@
-# OPS_final_Practical
\ No newline at end of file
+# OPS_final_Practical
+MERGING CONFLICT - ABCD
diff --git a/add.c b/add.c
index 9eb5c45..2b196ad 100644
--- a/add.c
+++ b/add.c
@@ -6,5 +6,6 @@ Int a=10, b=10, c;
 clrscr();
 c=a+b;
 printf("C=%d", c)
+  scanf(&d)
 getch();
 }