adding conflict file