Minor changes, which will now trigger a merge conflict.
Resolved merge conflict.