feature 1 edit 1
feature 1 edit 2
feature 1 edit 3
feature 1 edit 4
edit 4
master edit 5
master edit 6
Merged feature 2, squashed history