branch:master first commit
branch:testing commit first
Merge branch 'testing'

Conflicts:
	CHANGE

resolute conflict between branch:master and branch:testing