Resolving previous merge conflicts.