Do not propagate conflicts