Fix string types

And remove merging artifact