edx-west carnegie/cme roles: resolve conflicts