diff --git a/README b/README index 980a0d5..a3ba81c 100644 --- a/README +++ b/README @@ -1 +1,6 @@ Hello World! +<<<<<<< HEAD +### Branch Feature - Added on conflict branch +======= +### Master Branch Update - Conflicting Line +>>>>>>> master