merge wine-website's Todo