Fix Conflicts | Skills Pool