Added text again
Fixed another conflict