fixed mergre bug
fixed mergre bug

Deathangel908/djangochat,Deathangel908/djangochat,Deathangel908/djangochat,Deathangel908/djangochat,Deathangel908/djangochat,Deathangel908/djangochat,Deathangel908/djangochat