before last merge