Fixed strings merge conflict