Merge

Resolved merge conflicts