Resolved merge conflict (?)