Resolved some merge conflicts. This must be done manually.