- Resolved merge conflicts with !4323 - Minor refactor of affectsSkill helper function - Removed redundant class definition