separated the df
merge conflict fixes

Conflicts:
	main.py