fix merge conflict
Merge branch 'master' of github.com:elan2wang/bmp
fix merge conflict