Able to prepend new messages onto the feed via websockets
resolve merge conflicts