2nd line b other branch
merge conflict resolved