fixed funny merging behaviour. Now adding msg and voting works, in real-time.