added skills
fixed conflicts