Dueling cannabis bills await action