fix merge error. apply genTypeClasses task