add ddd to aa.txt
fix aa.txt merge conflict