fix wayname
fix wayname fix conflict