Hopefully resolved merge conflicts.