@mtejera You may want to look at the package I created [1] that attempts to recreate lost step information and merge conflicting changes to the same document (it can be setup up to automerge everything that can be merged without conflicts and show a A-or-B interface for those changes where one has to choose between A or B. Merging changes is no exact science, and contributions are very welcome.
[1] Recreating steps