diff --git a/conflict.html b/conflict.html index 183c289..68453fb 100644 --- a/conflict.html +++ b/conflict.html @@ -7,6 +7,7 @@

Hello Good Evening All....

-

Welcome to our new project

+

Welcome.....

+

Hii....welcome to this file

\ No newline at end of file