Resolved merge-errors.