diff --git a/README b/README index 0f28273..a3ba81c 100644 --- a/README +++ b/README @@ -1,2 +1,6 @@ Hello World! -### Branch Feature - Added on conflict branch \ No newline at end of file +<<<<<<< HEAD +### Branch Feature - Added on conflict branch +======= +### Master Branch Update - Conflicting Line +>>>>>>> master