Revert "conflict'i çözdüm"

This reverts commit 9c548ea3e29d343fbf389517bc4bd726a4eb3375.