resolve merge conflicts

docs/_footer.md

@@ -1,2 +1,2 @@
 ---
-Wiki created by <a href="https://twitter.com/joshdavislight">Josh Davis</a> and <a href="https://twitter.com/TMIYChao">Mário Havel</a> from Protocol Support, maintained by EPFsg community. <a rel="license" href="https://github.com/eth-protocol-fellows/protocol-studies/blob/main/LICENSE"><img alt="CC License" style="border-width:0" src="https://licensebuttons.net/l/by-sa/4.0/88x31.png" /></a><br/> This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International.</a>.
+EPF Wiki initiated by EF Protocol Support and maintained by EPFsg community. <a rel="license" href="https://github.com/eth-protocol-fellows/protocol-studies/blob/main/LICENSE"><img alt="CC License" style="border-width:0" src="https://licensebuttons.net/l/by-sa/4.0/88x31.png" /></a><br/> This work is licensed under a <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0/">Creative Commons Attribution-ShareAlike 4.0 International.</a>.

docs/_navbar.md

@@ -1,3 +1,3 @@
 * [Home](readme.md)
-* [Study Group](study-group.md)
+* [Study Group](/eps/intro.md)
 * [Contribute](contributing.md)

docs/_sidebar.md

@@ -25,19 +25,21 @@
   - [Overview](/wiki/protocol/overview.md)
   - [History](/wiki/protocol/history.md)
 - Execution Layer
-  - [EL Clients](/wiki/EL/el-clients.md)
   - [EL Specs](/wiki/EL/el-specs.md)
-  - Client architecture
+  - [Client architecture](/wiki/EL/el-architecture.md)
+  - [EL Clients](/wiki/EL/el-clients.md)
+    - [Besu](/wiki/EL/clients/besu.md)
+    - [Reth](/wiki/EL/clients/reth.md)
   - [EVM](/wiki/EL/evm.md)
   - [Transaction anatomy](/wiki/EL/transaction.md)
   - [JSON-RPC](/wiki/EL/JSON-RPC.md)
   - [Data Structures](/wiki/EL/data-structures.md)
   - [DevP2P]
   - [Precompiled Contracts](/wiki/EL/precompiled-contracts.md)
 - [Consensus Layer](/wiki/CL/overview.md)
-  - [CL Clients](/wiki/CL/cl-clients.md)
   - [CL Specs](/wiki/CL/cl-specs.md)
   - Client architecture
+  - [CL Clients](/wiki/CL/cl-clients.md)
   - [Proof-of-Stake]
   - [Beacon API]
   - [Networking](/wiki/CL/cl-networking.md)

docs/eps/intro.md

@@ -41,7 +41,7 @@ The second part of the program offers two distinct tracks focused on development
 | April 10 | MEV and censorship            | [Barnabe Monnot](https://github.com/barnabemonnot)                                     | Research    |
 | April 15 | Devops and testing            | [Parithosh](https://github.com/parithosh)                                               | Development |
 | April 17 | Purge and Portal Network      | [Piper Merriam](https://github.com/pipermerriam)                                       | Research    |
-| April 22 | Cryptographic precompiles     |                                                                                        | Development |
+| April 22 | EL precompiles                |  Danno Ferrin                                                                          | Development |
 | April 24 | SSF and PoS Upgrades          | [Francesco D’Amato](https://github.com/fradamt)                                        | Research    |
 | April 29 | Wrap up                       |                                                                                        |             |