fixing conflig