restore last merge