Conflict test 2
Merge branch 'rick-dev' of /Users/rick/Documents/Code/Solware/git-test with conflicts.
Merge remote-tracking branch 'origin/rick-dev' into rick-dev