fixed fucking merge
fixd text view size