modify controller and manager of estate
combine conflicts
combine conflicts
debug command sell.