move uploadHistory to more complete dataset
handle end-to-end raw data import
merge conflict resolution