Actually resolved merge conflict.