my side of the story

[hathai191]

No description provided.

[floridop]

Hi! Thanks for your submission.

Unfortunately it seems that there were changes in the main that conflict with yours.
Could you please perform a merge as described in Tutorial 3 slides 90-103 and integrate those changes?
Start with synchronizing your local main with my upstream main as described in slide 98.
We do not want to lose any existing content, so you should keep what others have written and add yours.
You're free to reorganize the content blocks so that it still makes a story, but please do minimal changes
to the content of what others have written to integrate them with yours.
The merges will be approved according to arrival time starting from October 23th, 22:00,
so expect that you need to merge several times after that time.
If I do not approve the changes you will be asked to update the content.