Refactor try_again restart handling
merge heads