merge-files 

ui buggy, but mostly my fault.  good work so far @cvuong