Bug Fix: Adding new authoring timeline caused merge conflicts.