Resolved merge conflicts for production