Fixed one more merge conflict.

Fixed infinite loop when comparing notes.