City commissioners tee up controversial Phipps land annexation for vote