fix conflicts

_apidefinitions/bridge.md

_apidefinitions/broadcast-ops-customs.md

_apidefinitions/condenser-api.md

_apidefinitions/database-api.md

_config.yml

_data/apidefinitions/account_by_key_api.yml

_data/apidefinitions/account_history_api.yml

_data/apidefinitions/block_api.yml

_data/apidefinitions/bridge.yml

_data/apidefinitions/broadcast_ops.yml

_data/apidefinitions/broadcast_ops_customs.yml

_data/apidefinitions/condenser_api.yml

_data/nav.yml

_introduction/web3.md

_introduction/welcome.md

_introduction/workflow.md

_layer2/_defaults.md

_layer2/engine.md

_layer2/honeycomb.md

_layer2/vsc.md