Allow merging of changes between two paper_trail version "branches"