Resolve merge conflicts

Author: eserilev

book/src/api_lighthouse.md

@@ -447,29 +447,6 @@ indicating that all states with slots `>= 0` are available, i.e., full state his
 on the specific meanings of these fields see the docs on [Checkpoint
 Sync](./advanced_checkpoint_sync.md#how-to-run-an-archived-node).
 
-<<<<<<< HEAD
-=======
-## `/lighthouse/custody/info`
-
-Information about data columns custody info.
-
-```bash
-curl "http://localhost:5052/lighthouse/custody/info" | jq
-```
-
-```json
-{
-  "earliest_custodied_data_column_slot": "8823040",
-  "custody_group_count": "4",
-  "custody_columns": [
-    "117",
-    "72",
-    "31",
-    "79"
-  ]
-}
-```
-
 ## `/lighthouse/custody/backfill`
 
 Starts a custody backfill sync from the current epoch with the nodes latest custody requirements. The sync won't begin immediately, it waits until the current epoch is finalized before triggering.
@@ -479,7 +456,6 @@ curl -X POST "http://localhost:5052/lighthouse/custody/backfill"
 ```
 
 
->>>>>>> 9d30af8cc (Add tests)
 ## `/lighthouse/merge_readiness`
 
 Returns the current difficulty and terminal total difficulty of the network. Before [The Merge](https://ethereum.org/en/roadmap/merge/) on 15<sup>th</sup> September 2022, you will see that the current difficulty is less than the terminal total difficulty, An example is shown below: