add emmet keybindings
fix merge conflict