What is a conflict file?

Follow