bumping defaults
merging