fixed proto file number conflicts