Removed storage from git
Merge conflicts