Fix Reactor merge