Whopping character background and story corrections. Don't read Mallow's char description if you don't want a spoiler.
Fix merge conflict