prepare to merge with chat