Just wanted to reiterate that I'm happy to help with resolving conflicts with the pull requests of anyone who has trouble with the mechanics of git.
If you do plan on taking me up on this offer, then please leave this checkbox ticked (the default state of it) when opening the PR. This will allow me to do a force push to your branch and thus updating the PR to a desired state that usually means not having merge commits that destroy the accuracy of the commit log/git blame features.
Below is the checkbox in action, for reference:
Accenture Products & Platforms (APP)
Office: +1 (415) 537-5541
Mobile: +1 (650) 488-1741
This message is for the designated recipient only and may contain privileged, proprietary, or otherwise confidential information. If you have received it in error, please notify the sender immediately and delete the original. Any other use of the e-mail by you is prohibited. Where allowed by local law, electronic communications with Accenture and its affiliates, including e-mail and instant messaging (including content), may be scanned by our systems for the purposes of information security and assessment of internal compliance with Accenture policy. Your privacy is important to us. Accenture uses your personal data only in compliance with data protection laws. For further information on how Accenture processes your personal data, please see our privacy statement at https://www.accenture.com/us-en/privacy-policy.