text on line 3
a commit message
Merge remote-tracking branch 'refs/remotes/origin/caleb_dev' into to_be_pulled

Conflicts:
	a_file