merge localstorage changes as this makes a valid standalone app