added emmet as a submod
merge conflict fix