Committing to Story12345 branch, hopefully!
Second change for branch Story12345
Commit for Story12345 while the branch is remote
Merge branch 'Story12345'

* Story12345:
  Commit for Story12345 while the branch is remote
  Second change for branch Story12345
  Committing to Story12345 branch, hopefully!

Conflicts:
	src/classes/Test1.cls