# error: Your local changes to the following files would be overwritten by merge: db.json Please commit your changes or stash them before you merge.