Text
Fixed conflicts