Commit in branch feature-branch-1-dev
Resolve conflict
Merge pull request #26 from hatchan/feature-branch-1-dev

Commit in branch feature-branch-1-dev