Fixes

* Fixes NPE in mergeItem, a list could not have been initialized
* Fixes NPE when null intent is received
* Fixes the dialog when adding a new list