commit to feature branch
resolved conflict
commit to feature branch
merged
Merge pull request #1 from christianbach/feature

Feature