pushing nothing so you get conflicts tomorrow