fixed bug
realtime edits
realtime merges