Resolved merge conflict properly this time.