turned off graph fill
fixed merge conflict