merge getdrink and master