merged controllers