Update df_data.py

merge fixed?