Text revision
Fixed conflicts