got blasted by merge