changestr merge fix