remove git-conflict message from StateFlowGraph.java
Merge pull request #340 from daisy1754/refactoring/remove-git-conflict-message

remove git-conflict message from StateFlowGraph.java