Resolving conflicts
More convient way to track versions on SynsetWord
Track versions on editor#edit_marks
Smart way to create old_synset_word