resolved merge conflict in advanced_refiner.txt