merged conflicts
truncating text in label element