BUG: Keep float dtype in merge on int and float column#18352

jreback merged 8 commits intopandas-dev:masterpandas-dev/pandas:masterfrom

reidy-p:merge_int_floatreidy-p/pandas:merge_int_floatCopy head branch name to clipboard