diff --git a/README.md b/README.md index 2813b2c6c2dc6d9d9af06d669edf338fe58b4196..50b4a69fe88bd75e1f21becd190720469fcd0295 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,5 @@ This will also cause a conflict. ======= This will cause a conflict. >>>>>>> conflict-branch +Staged change +Remote branch change