merge skills branch, with skills crud feature and join table