We use git. No need for backup files
Trying to pinpoint merge problems