package update
change key bind
fix conflict