Resolved merge conflicts in Project2 that persisted through commit.