pushing up cleared conflicts