Resolve merge errors