fixed graph merge conflicts