The two skills are separate, with only one being applied at a time, depending on if you are using a shield. You'd think there would be some overlap, but I guess that would be much harder to balance.