modify 3files
Merge branch 'conflict_test6_merge'
conflict fix