improper conflict resolution