remove git-conflict message from StateFlowGraph.java