Add group permissions
Resolve merge conflicts