updated goals and achivements section
fixed conflicts