Added vim conceal and some minor changes
fixing merge conflict