update
merge confilt
add diagnose type to gamyy
Merge branch 'master' of https://github.com/yt7589/wae