change pwd
fixed conflicts
fixed bugs wiht graph