Fix conflict with merging in reactor changes