Resolve merge conflicts

pandas/io/excel.py

@@ -144,11 +144,6 @@
     convert integral floats to int (i.e., 1.0 --> 1). If False, all numeric
     data will be read in as floats: Excel stores all numbers as floats
     internally
-has_index_names : boolean, default None
-    .. deprecated:: 0.17.0
-       For version 0.17+ index names will be automatically
-       inferred based on index_col.  To read Excel output from 0.16.2 and
-       prior that had saved index names, use True.
 
 Returns
 -------