commit 1 on branch1
commit 2 on branch1
Brent's changes!
commintting locally
I made a change
Merge branch 'branch1' into branch2

Conflicts:
	file1.txt
	file2.txt
	file3.txt
	file4.txt