oops
Always git merge --no-ff.