resolve conflict and disable FDE