punts on binary files

if you try and merge or do any block manipulation borrower punts on binary files with a cryptic "UTF-8" error