Thymes merges with maker of Aspen Bay and Capri Blue fragrances