fix merge conflict
update emmet plugit settings
Update javascript snippets