Resolving merge conflicts.