fixed graph for user
merge conflicts