added jk -> Esc, and ; -> :
fixed conflicts