retry, not auto merge