Merge 2
Resolved merge conflicts.