Means less interaction for folks just riding on the default train without overwriting the work of people who've made changes.
Closes #229 Co-authored-by: @jhosdev