Some updates
Conflict resolved
Popup for MD cheatsheet