after merge
after merge from DEV
just try
sync from master
Merge branch 'master' into dev

Conflicts:
	Hello/githubhello.txt
reedit in DEV