skills functionality added
fixing merge conflicts