copy/paste silindi, run düzeltildi
conflict resolved