resolve merge conflicgts