* fixed to increment nFilesUsed when merging is killed before merge generation
* added protection against orphaned merge jobs