now really started working on new feature
Still working on feature
Hotfix completed
Feature is finished
Merge branch 'sample-issue'
one half of a conflict
Other half of a conflict
Resolving epic conflict
Preparing for our second conflict
triggering second conflict
Merging first conflict
Second conflict resolved