First commit to dev2
First commit to dev1
Second commit to dev1
Merge branch 'master' into dev2
Merge branch 'master' into dev2

Conflicts:
	file1.txt