[Kali] Fixed wrong conflict resolution