Update 00add00.txt
fix conflict
add 00add02.txt
Merge branch 'master' into kk