Version: 0.7.25: file-merge tech