test commit for merge conflict round 2
merge conflict resolution practice
Merge pull request #3 from jpark1120/master

test commit for merge conflict round 2