Jerry Brown wades into pot battle with plan to merge medical, recreational laws