Resolved merge, 2nd take