Allow leaving comments when overriding conflict.

Erez Zadok report.