Lost a dangling comman during conflict resolution