resolving merge confilict
Revert "resolving merge confilict"

This reverts commit 6eb6298689ed5681e35513ae76243ca99064ea97.
Revert "working with textEdit"

This reverts commit 84bec50524c5d9c6d0a506fde586ffd17cf6692c.
merging conflicts, cleaning old files