fix: conflicts #1945

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-client-e2e-followers-consistent-build (x86_64)	11m 56s
suzuka-client-e2e-followers-consistent-build (arm64)	36m 44s
suzuka-client-e2e-simple-interaction-build (x86_64)	13m 15s
suzuka-faucet-service-build	0s
suzuka-client-e2e-simple-interaction-build (arm64)	36m 3s
suzuka-full-node-build	0s
suzuka-full-node-setup-build	0s
suzuka-indexer-build (x86_64)	16m 2s
wait-for-celestia-light-node-build	0s
suzuka-indexer-build (arm64)	36m 34s
bridge-service-build	0s
bridge-setup-build	0s
helios-build	0s
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
wait-for-celestia-light-node-manifest	0s
bridge-service-manifest	0s
bridge-setup-manifest	0s
suzuka-full-node-setup-manifest	0s
helios-manifest	0s
suzuka-client-e2e-followers-consistent-manifest	0s
suzuka-client-e2e-simple-interaction-manifest	0s
container-checks	0s
suzuka-indexer-manifest	36s
	2h 31m 10s

Provide feedback