Resolved conflicts I had with messaging / bitgrid