suifans

Hi @gene-zhan, I've resolved the conflicts with develop branch in my fork: Branch: [fix/resolve-conflicts](https://github.com/yueliao11/eliza/tree/fix/resolve-conflicts ) Changes made: - Resolved conflicts in .env.example - Resolved conflicts in agent/package.json - Resolved conflicts...