Testing what should be a conflicting commit.
Manually resolved
Testing changes to MASTER after merge
Committing to 112PM test branch
Merge remote-tracking branch 'remotes/origin/master' into 1125pmTestBranch
Merge pull request #2 from MarkReichard/1125pmTestBranch

1125pm test branch