After Solving the conflict