Fixed conflict
Merge branch 'master' of github.com:christian-com-techniques/DstrGroupMem
myconf
Merge branch 'master' of github.com:christian-com-techniques/DstrGroupMem
Merge branch 'master' of github.com:christian-com-techniques/DstrGroupMem