issue tracking + merging branches test - fixes #1
Merge remote-tracking branch 'origin/feature-test'