smashwilson/merge-conflicts — pull request #85 by smashwilson (2014-11-08 15:53:03+00:00)
Title: Render controls over text

The merge controls were now being rendered *under* the editor text, which looks strange:

![selection_009](https://cloud.githubusercontent.com/assets/17565/4964657/56365096-6735-11e4-8add-a3d2cc6420ad.png)