Merge-o-rama coming.
Fixing conflict in toc
Conflict resolution.
Conflict resolution.
More conflicts.
Objects