Optimize for file conflict case