Commit before merge.
Resolved merge conflicts.