Resolve conflicts.
Fix happens-before relationship.