added setting for deleting of related files
merging