bytes received/sent resolve merge conflict