chat feature not done
fix conflict
updated db