Add trello in readme.md
Fix conflict in readme.md