Replace original code to the code by ourselves

merge most person to group space, thank you