fix implement for new wine
fix shows
fix conflict
Merge branch 'fix/wine_new'