Fixed more merge conflicts.