branch new
fixed
branch new
deleted line
deleted = signs
Merge branch 'no-ff-merge'
test