added updated active_merchant dependency