merge in new upload record work
further work and add tests for removing overlapping uploads from same model of device