Resolved merge issue.