LTextView
merget the conflicts