Solved some conflicts that appeared out of nowhere.
Formalised trace semantics.