Feature 1 commit test
Finish feature-1
Merge branch 'origin/master'