Fixed merge error in storage js