Added more code to Feature X
.gitignore is updated again?
Merge remote-tracking branch 'origin/feature-xyz' into feature-xyz