modify the readme file in branch
modify the readme file in feature1
modify the readme fiel in master
conflict fixed