Delete conflict messages from japanese translation
Merge pull request #117 from coheyxyz/fix_merge_failure

Delete conflict messages from japanese translation