[SQUASH ME] added "groups" of conflicting features separated with ':',
            and made the conflict message optional