Strings are strings, flatten them out
Fixed merge