Added some local configurations
Merge conflict
Added markdown-mode