work in the 'dev' branch
Add a new line from branch feature1
from master
conflict fixed