#3 complete
#3 merge localStorage