Resolved more merge conflicts.