diff --git a/README b/README index 9c8d121ee2a1ec62458473c03aea5c2d41184b03..1fa54e9e13dd64d7c1fd2a9d6cad261c0a73f0c6 100644 --- a/README +++ b/README @@ -8,4 +8,10 @@ I am now editing this file on the main branch However, the changes that I made on Branch_a are not here -I am going to try and merge the different files§ +I am going to try and merge the different files + +I am now editing this vim file on Branch A, this is so that any changes won't affect the main branch but I am from to work on this in isolation + +Update: I have merged both files so edits from both branches are now here. I have also removed details such as the >>>head + +We are ready to commit