atlaas_merge + revert ROBOTPKG_ARCH