separate thing merge from merge