nits for last merge