Adds file conflict method