add files and reset to merge status