Fixed a typo.
Resolved merge conflict