resolve conflict #2007

Job	Run time
tests (A-B tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFinOrg/...	1m 23s
tests (C-[a-m] tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFin...	1m 46s
tests (C-[n-o] tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFin...	7m 28s
tests (C-[p-z] tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFin...	36s
tests (D-I tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFinOrg/...	2m 40s
tests (J-N tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFinOrg/...	2m 36s
tests (O-R tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFinOrg/...	1m 25s
tests (S tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFinOrg/XD...	11m 31s
tests (T-Z tests, go run build/ci.go test -coverage $(go list ./... \| grep "github.com/XinFinOrg/...	1m 1s
devnet_build_push	0s
tag_build	0s
devnet_terraform_apply	0s
rpcnode_terraform_apply	0s
devnet_send_notification	0s
testnet_dev-upgrade_node	0s
devnet_dev-upgrade_node	0s
mainnet_dev-upgrade_node	0s
	30m 26s

Provide feedback