entered by mistake from conflict resolution