I believe this file is what is causing the merge conflict. I recently accepted a PR which placed the code blocks in proper markdown format for GH. Would you double-check that and fix?