Only makes conflicted copies when actual conflicts in files exist