change coding READEME
fix conflict READEME