added flea code
fixed merge error