Updating some strings.
Fixing the conflicts, some string changes.

This should resolve the conflicts.