resolve merge errors