Storage Unit flowiness
Fixed conflicts