removed some unused markdown snippets
use meld for merges (better)