Fixed localstorage merge