add <hello dear>
resolve conflicts of readme.txt