Pushing current state to avoid conflicts