Does the merge button always generate a merge commit? (--no-ff)