other merge errors