Merging over the usb changes didn't work. I must delete and copy the changes manually.

Deleted: branches/cache_manager_rewrite/reactos/drivers/usb/