Completed project.
Resolved merge conflicts.