fail placing
Revert "fix fail git merge"

This reverts commit e42ed2d77a157a21b7439c4cbfdcccc08972fd36.
Merge remote-tracking branch 'origin/master'

Conflicts:
	main.py