Update 00add00.txt
fix conflict