Merge new retry logic