push before conflict resolution