Fixed Text Transitions
Fixed merge coonflict