Resolved merge issues.