Fixing more merge conflicts.