small changes to graphing
merge confilict resolution