Update text on win and lose screens.
Fix merge conflict.