fixed conflig