merge from origin atom/atom