revert to try and override merc controller in firehouse project