Resolved merge conflicts - reload extension warning