Can anyone tell me the difference between a fork/join and a branch/merge in an activity diagram? They seem to do just the same thing. On a related query, should state diagrams also have the fork/join and branch/merge widgets? Thanks Jonathan Riddell