contents not pushed from last conflict