Add Ctrl-P for faster file switching
Add Ctrl-p
Fix merge