change the group ID
merge conflicts