First stab at a happens-before graph.
Resolve conflicts.