consolidating from merge