resolve conflicts #23916

Job	Run time
Detect changes	11s
Split Solidity Tests	16s
Solidity Coverage cross-version 1/1	3m 43s
Solidity Coverage v0.8 1/6	7m 11s
Solidity Coverage v0.8 2/6	29m 11s
Solidity Coverage v0.8 3/6	17m 43s
Solidity cross-version 1/1	2m 8s
Solidity Coverage v0.8 4/6	15m 16s
Solidity v0.8 1/6	3m 6s
Solidity Coverage v0.8 5/6	14m 8s
Solidity v0.8 2/6	12m 44s
Solidity Coverage v0.8 6/6	25m 48s
Solidity v0.8 3/6	5m 24s
Solidity v0.8 4/6	4m 24s
Solidity v0.8 5/6	11m 48s
Solidity v0.8 6/6	5m 25s
Solidity	6s
Solidity Coverage	20s
	2h 38m 52s

Provide feedback