Can add and edit mementos locally
Fixed a merge conflict