Finish chat for now
Fix merge conflicts