Merge conflict with iccr

Hi, 

I'm wondering if there is a bkm to resolve a merge conflict.

I have been running iccr merge just fine until I had to fix one of the coverpoints. Now I'm getting a coverpoint not merged - description differs.

Thanks,

-Victor