Fix conflig