Mergable files

implements #13