add some lines in README after reset
solve the conflicts