add default_storage
fix conflicts