Fixed some more merge conflicts.