Message view proto
resolve merge conflict