Mass reformatting of conflicting files