dev branch add a new line
and a new line bu feature1 branch
master add a new line too
fixed conflict
just test branch
merge with no ff