Resolved merge conflicts.