Re-commit with conflict fixed.