base version to start from.
resolving conflict for .gitignore