# EPF Cohort 6 – Week 17 Update ## Progress this week I was working on resolving merge conflicts between my fork and the latest Grandine changes on the develop branch. I was also updating the latest changes from the `peerdas-fulu` branch in the `eth2_libp2p` submodule to tracing. Progress can be followed here: - [issue #23](https://github.com/sntntn/grandine/issues/23) - Backport latest develop changes into tracing (and resolve conflict) - [issue #24](https://github.com/sntntn/grandine/issues/24) - Make all tests pass (peerdas-fulu changes updated to tracing) - [issue #25](https://github.com/sntntn/grandine/issues/25) - clippy cleanup - Related changes were also made in the `eth2_libp2p` submodule: [issue #8](https://github.com/sntntn/eth2_libp2p/issues/8) and [issue #9](https://github.com/sntntn/eth2_libp2p/issues/9) --- Resolving the merge conflicts was fantastic - especially when you see thousands of conflict lines 😅. And the merge commit looked [like this](https://github.com/sntntn/grandine/commit/e4ca206b9055dfbc41d8b047d3fb3d75ad2e6c35): ![image](https://hackmd.io/_uploads/r1hKFhYpll.png) After resolving conflicts and updating the latest Grandine changes to tracing, I also updated the versions of tests and made sure all of them pass again ✅. ![Screenshot from 2025-10-12 11-10-42](https://hackmd.io/_uploads/By20Wr5aee.png) In the meantime, I dedicated some time to researching merge conflict memes ([example](https://hackmd.io/@sntntn/rJgoihFTgl)) to find strength for that hardcore job in our developer community 😄. ## Next Summarize everything and open **official PRs** to grandine, and to the eth2_libp2p submodule. After that, I expect to receive feedback from the Grandine team regarding the **core instrumentation setup** - depending on their current needs and priorities. ## Resources - [Grandine forked repo](https://github.com/sntntn/grandine/tree/feature/tokio-tracing) - [eth2_libp2p forked repo](https://github.com/sntntn/eth2_libp2p/tree/feature/tokio-tracing2)