Adding local storage
Fixed conflicts