Steven's commit
Resolved merge conflict