small changes
fixed merge conflicts
add protobuf conifg file