diff --git a/README.md b/README.md index 21bc1b8c3ea2f099e6ea7ba7d1f1c4a1c0e7554f..2813b2c6c2dc6d9d9af06d669edf338fe58b4196 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,7 @@ # Git Laboratory This is a feature branch. +<<<<<<< HEAD This will also cause a conflict. +======= +This will cause a conflict. +>>>>>>> conflict-branch