Updating for merge.
Resolved merge conflicts.