more conflict resolutions for broken build after pull