Resolving merge conflicts.\