pulling
pulling
ok
scrolling highlights graph
 fixed conflicts