ml: resolving merge conflicts.