BUG: resolve left/right key names overlap in merge#665

ogrisel wants to merge 2 commits intopandas-dev:masterpandas-dev/pandas:masterfrom

ogrisel:merge-overlapogrisel/pandas:merge-overlapCopy head branch name to clipboard