fix setting conflict base for pull conflicts, plus tests