Fix rebase conflicts with skillsAPI.