Resolved merge conflicts.

Resolved merge conflicts.