Add thread merging TODO + reporting