Fix comment on conflict policy

Existing comment is incorrect and does not describe what actually
happens.

Test: no change to behavior
Change-Id: I7ef7ee7c60ee11180a0c49f0f74971b66d5e519e
1 file changed