[merge] update merge form another atlaas