update merge errors