continous saving and merging conflicted texts.