fixing reset2
fixing confict merging