merge with add-and-reset my small changes