renamed collapse_controllers to merge_controllers