the first modify
2nd modified
Merge branch 'dev'

Conflicts:
	test.c