Fixing merge mistakes.