new bmp
merge conflict