fix merge conflict in ThreadPoolBuilder without borking whitepsace and removing stuff