fixed a string
merged