fix: conflict

.circleci/config.yml

.github/CODEOWNERS

.github/CONTRIBUTING.md

.github/workflows/ci.yml

.github/workflows/linuxpackage.yml

.travis.yml

COPYING

Dockerfile

Dockerfile.alltools

Makefile

README.md

SECURITY.md

accounts/abi/abi.go

accounts/abi/abi_test.go

accounts/abi/argument.go

accounts/abi/bind/auth.go

accounts/abi/bind/backend.go

accounts/abi/bind/backends/bor_simulated.go

accounts/abi/bind/backends/simulated.go

accounts/abi/bind/backends/simulated_test.go