damage text?
fixing conflicts