change README.md
add one line
Update master.txt
add feature_y.txt
Merge branch 'feature_y' into feature_x
This is test for merge feature x and y