Revisit reset after push conflict