fixing reset2
fixing conflect
Merge branch 'scratch1'
add new file email