chore: resolve conflicts

[PatrickMenoti]

No description provided.

[github-actions]

CLA Assistant Lite bot:
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. You can sign the CLA by just posting a Pull Request Comment same as the below format.

---

I have read the CLA Document and I hereby sign the CLA

---

4 out of 5 committers have signed the CLA.
✅ @fmiamoto
✅ @PatrickMenoti
✅ @askazion
✅ @maxwelbm
❌ @srmaxmazur
srmaxmazur seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You can retrigger this bot by commenting recheck in this Pull Request}