New feature3.
Edit feature3.
More feature3.
Merge branch 'feature3'