Add navigator tests to ConflictSpec.
Split Navigator into its own class.

Track next and previous Conflicts.