My merge

Resolved merge conflict.