separate the base conflict resolution.