Set up the conversions
Resolved merge conflicts