Always merge with commit, in case merge has been set to rebase by default