resolve conflicts #12713

Job	Run time
Split Solidity Tests	17s
Detect changes	7s
Solidity Coverage cross-version 1/1	1m 1s
Solidity Coverage v0.8 1/6	59s
Solidity cross-version 1/1	1m 3s
Solidity Coverage v0.8 2/6	58s
Solidity Coverage v0.8 3/6	48s
Solidity Coverage v0.8 4/6	1m 6s
Solidity v0.8 1/6	1m 2s
Solidity Coverage v0.8 5/6	51s
Solidity v0.8 2/6	1m 1s
Solidity Coverage v0.8 6/6	1m 4s
Solidity v0.8 3/6	1m 5s
Solidity v0.8 4/6	1m 3s
Solidity v0.8 5/6	59s
Solidity v0.8 6/6	1m 4s
Solidity Coverage ${{ fromJSON('["(skipped)", ""]')[(needs.changes.outputs.changes == 'true')] }}	0s
Solidity	7s
	14m 35s

Provide feedback