took out the stupid Hash.new(0)
also, not returning the file, no need
merge