adding conflict