Create test
Merge remote branch 'upstream/master'
commit about change