Resolved merge.