delete the second line
merge with no-ff
end the issue
merged bug fix 1
change