resolve more conflict from upstream