added the first (and worst) version of a revision history
removed merge conflicts on schema