Guns and edged weapons have been a part of martial combat for a very long time. What most people forget is combat consists of only ranges.
Projectile range which covers everything from ICBMS to throwing a rock or bottle at someone.
Then kicking range, then boxing, then trapping, then grappling. Use the wrong weapon in the wrong range and you get dead.
Talking about traditional vs modern really misses the mark if ranges are ignored. The idea a katana is a more deadly weapon then a Glock is only applicable if the subjects are in range where the katana can reach the other person. At 20 yards, the Glock is clearly the better weapon, at 200 yards, a scoped 308 is better then a Glock and the katana is nothing but a prize for the guy with the rifle.