update reset
cleaning confect and merge master