Change default overwrite option to keep

This is the most backwards compatible option, though we may want to change it to error in future