modified the graphs a little
fixed conflicts