Resolved merge conflicts from yesterday