diff --git a/file.txt b/file.txt index 72484fd..692857e 100644 --- a/file.txt +++ b/file.txt @@ -5,5 +5,7 @@ There changes are to learn that how to resolve conflicts. These are the changes in the sample branch so that later we can merge it with the main branch. These are the changes in the main branch so that we can learn how to resolve it. CONFLICT RESOLUTION: +the changes is made into sample file +the change is made into Sample File the changes are made into Sample File