resolved merge side effects on search