diff --git a/README b/README index 707c0eab477c83dbf9af0289b61a46951fc0b25b..4cc05a22867fff556b4c42d0696c5a52517b71a5 100644 --- a/README +++ b/README @@ -17,4 +17,7 @@ Update: I have merged both files so edits from both branches are now here. I hav We are ready to commit -Update: I am now making changes on the main branch again +Update: I am now making changes on the main branch again: + +I am making some new changes to test out my ability to resolve conflicts +