formatting fixed to native word in Grey Gundam Campaign
fixed merge issue
more merge issue fixing