Add TODO about testing various merge error scenarios.