working on SQLitePersistenceManager
fixed merge conflict