allocate and remove clients from the HTC client's unallocated list
fix merge conflict