Django TextField which will handle merging and conflicts on save