FIxing conflict