Begin work on electronic format.
Fix conflicts.