Fix merge conflict with both changes #341

We can now resolve merge conflicts in the GitHub UI. Often with merge conflicts, I want to include both the conflicts as it's usually just two list items being placed at the end. Would be nice to have a button that just removed the merge conflict markers.

<img width="797" alt="screen shot 2016-12-13 at 00 33 35" src="https://cloud.githubusercontent.com/assets/170270/21121426/8e471ec8-c0cc-11e6-8420-5c7bbe2e9810.png">

Above, I would have like to preserve both the items. The red characters are the markers I would like removed.