finished conner::update_conner_type
finished rectangle conflict