handling merge errors