add guideline.txt
add one line
add one different line
confict fixed
add alex info
dev-ycx add content
Merge branch 'dev-ycx' into dev
fixed issue 101