fixed stupid error - get images for trip
merge
added back delete files from merge