remove data file staging.
Merge remote branch 'upstream/master'