change to bitdevelop
fixed merge conflict