test git merge
Merge branch 'newbranch'

Conflicts:
	sys_config/a20/Bananapi.fex

test merge confict
correct