merge conflict and ignore db.json