Versions and conflict merging

This is a dropped design for merging conflicts between entry versions, in the Contentful web app. Its main trait is the arrow metaphor for picking versions, similar to any developer's diffing tool. The usability tests we conducted ruled it out for being too hard to grasp by non-tech-savvy people.