started working on chat feature
fixed merge conflicts