merging collapsed files should work now