diff --git a/hello.txt b/hello.txt index c0d53b9..37804af 100644 --- a/hello.txt +++ b/hello.txt @@ -3,6 +3,7 @@ hi <<<<<<< HEAD This is August hey +hello!!! ======= >>>>>>> parent of 388fc98... Made some changes