Create a conflict just because!
The other side of a disaster! (conflict test)
Merge branch 'testBranch'

Conflicts:
	index.cfm
Added a paragraph to practice with branches
Resolves the previous changes to "add a paragraph" and "branching"