test commit checking to see merge conflict behavior
Merge pull request #2 from jpark1120/master

test commit checking to see merge conflict behavior