Resolving conflict in code base.