Last write wins. Although tiddlywiki does detect the situation when file was changed on disk, there is not much you can do at this point. Before tiddlywiki I used to use pmwiki on a server and it has the ability to merge changes (via diff3). I miss that dearly in tiddlywiki.