merged storage changes