There are various strategies you can choose. If you mean creating a copy of the file with the conflict then yup.