Added extra challenges
fixed conflicts