resolve merge conflits