resolve merge conflict x2