fix accidental clobber from merge