Resolved merge conflict.