added cluster groups
fixed merge