Take a new approach to this, untangle rather than changing tids thus providing files which we can remerge correctly