Solved conflig