Fix some build error in bson_decode
Fixed merge conflict