merge with lazy-senior