add a to-be conflict file