Delete conflict messages from japanese translation

For some reason, the japanese translation has conflicting diff.