delete warning
Merge branch 'fix_warning'