remove deconflict code that breaks things