Resolved merge typo