Fix create groups and after merge