Changes in the trouble branch
I like this new name better
Comment on file10.txt - exercise
comment on the second edit
 I am deleting this file10.txt now
Completed merging, management of the conflict
Mainline work
Completed merge of trouble, fixing conflicts along the way