Don't raise warning on merging int and float with nan#21011

jreback merged 1 commit intopandas-dev:masterpandas-dev/pandas:masterfrom

jorisvandenbossche:merge-nan-no-warningjorisvandenbossche/pandas:merge-nan-no-warningCopy head branch name to clipboard