add retries around merge