Resolving conflict with upstream changes.