conflict resolved, please help to merge this change.
thank you.

Hi pdaniell,
I tried to fixing conflict and then click "mark as resolved" button.
But the "conflict" situation seems to still exist.

@gnl21 may have a better suggestion, but it appears you need to rebase to the latest in main and then merge your conflicts locally, commit and push that.

When resolving conflicts, please note that you will also need to move any changes in this branch to README.md, to corresponding asciidoc markup in README.adoc, and remove README.md .

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 2 committers have signed the CLA.

❌ wycwang
❌ wycwang0823
_{You have signed the CLA already but the status is still pending? Let us recheck it.}