update branch
add 1
master modification
merge conflict manually