Manual Resolved Conflicts:
Changelog.md
* Updated changelog
test/externalTests/ens.sh
* Merged fixes for upstream from both develop and breaking
test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
* Removed in #11735 (breaking)
test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
* Removed in #12209 (breaking)
test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
* Removed in #11843 (breaking)
test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
* Removed in #11843 (breaking)
test/libsolidity/syntaxTests/inlineAssembly/basefee_berlin_function.sol
* Used version of file from #11842 (breaking)