initial commit: feature b
Merge remote-tracking branch 'origin/feature-b'