Fixes merge conflicts
Membership changes