fix conflation