BatchStreamRecord Initial commit
conflict resolve