fix: merge conflicts. #3

Job	Run time
m1-da-light-node-build	0s
m1-da-light-node-celestia-appd-build	0s
m1-da-light-node-celestia-bridge-build	0s
suzuka-full-node-setup-build	0s
suzuka-client-e2e-simple-interaction-build (x86_64)	10m 42s
suzuka-client-e2e-simple-interaction-build (arm64)	32m 49s
suzuka-faucet-service-build	0s
suzuka-full-node-build	0s
wait-for-celestia-light-node-build	0s
suzuka-indexer-build (x86_64)	8m 52s
suzuka-indexer-build (arm64)	27m 28s
m1-da-light-node-manifest	0s
m1-da-light-node-celestia-appd-manifest	0s
m1-da-light-node-celestia-bridge-manifest	0s
suzuka-faucet-service-manifest	0s
suzuka-full-node-manifest	0s
suzuka-full-node-setup-manifest	0s
wait-for-celestia-light-node-manifest	0s
suzuka-indexer-manifest	6s
suzuka-client-e2e-simple-interaction-manifest	0s
container-checks	0s
	1h 19m 57s

Provide feedback