add conflict section as wrote seldaek