Interpretation
resolve merge conflict