manual resolve logic working