merge from amida