[Feature] TODO: figure out a better way to deal with the merge conflicts

[sinsukehlab]

Summary

ToDo of PR #53

Changes

Make a script to merge changes from origin/main into ci and run it before updating to Step 5 in the Step 4 workflow.

Additional context

An extract from the current Step 5 markdown

1. Go to the **Pull requests** tab.
1. Resolve any merge conflicts. <!-- TODO: figure out a better way to deal with the merge conflicts. -->
1. Click **Merge pull request**.