give option to not override files
Merge remote-tracking branch 'delux/toggle-override-files'