pure string change to echo something
change to echo
Merge branch 'feature_1'

Conflicts:
	test2.php
add vv
add nono
commit confilc