fixing bugs
treatment
fixed merge