Oregon marijuana bills focus on merging programs, higher sales tax