G2D
fixed some merging business