retrying merge commit