- switch to bz2 (7z has dos-ending files; bz2 unix-ending files); fix merge