Rename intermediate_avoid_conflicts to intermediate_bubble_up_down