Resolve merge conflicts Learn why conflicts happen and how to resolve them. Get help: Post in our discussion board • Review the GitHub status page © 2023 GitHub • Code of Conduct • MIT License