worked on a trace report for the Ex1a stuff.
resolved conflicts